Use track_add_wpt for all tracks

diff --git a/gpsbabel/brauniger_iq.c b/gpsbabel/brauniger_iq.c
index eed8cc93217b5a71d0bfbe50aaf7e77bcb17706d..8026d9795003e5c423e3d387333f749b45d58ab0 100644 (file)
--- a/gpsbabel/brauniger_iq.c
+++ b/gpsbabel/brauniger_iq.c
@@ -206,7 +206,7 @@ static int process_data(const unsigned char *data)
        wpt->creation_time = creation;
        creation += interval;
        wpt->altitude = (data[0] << 8) + data[1];
-       route_add_wpt(track, wpt);
+       track_add_wpt(track, wpt);
        if (global_opts.debug_level >= 2) {
            printf(MYNAME ": remaining=%d, Altitude=%fm, ", remaining, wpt->altitude);
        }

diff --git a/gpsbabel/cetus.c b/gpsbabel/cetus.c
index 4f59cd16b9c56493355a572197eb7ac66d1722c7..d7ba2de61170438bfeccbc19dd1ffc6191ed482e 100644 (file)
--- a/gpsbabel/cetus.c
+++ b/gpsbabel/cetus.c
@@ -266,7 +266,7 @@ read_tracks(const struct pdb *pdb)
                        wpt = read_track_point((cetus_track_point_t *)c, basetime);
                        if (wpt != NULL)
                        {
-                           route_add_wpt(track, wpt);
+                           track_add_wpt(track, wpt);
                            points++;
                            
                            /* Did we run over midnight ? */

diff --git a/gpsbabel/compegps.c b/gpsbabel/compegps.c
index 64df78cc611a9f59504012f3ca65519ad7c6257e..9923641532d1cd9052214907816986d5ce98d1da 100644 (file)
--- a/gpsbabel/compegps.c
+++ b/gpsbabel/compegps.c
@@ -396,7 +396,7 @@ compegps_data_read(void)
                                                track = route_head_alloc();
                                                track_add_head(track);
                                        }
-                                       route_add_wpt(track, wpt);
+                                       track_add_wpt(track, wpt);
                                }
                                break;
                        case 't':

diff --git a/gpsbabel/coto.c b/gpsbabel/coto.c
index be07e701dc6c9bfb266cda6489f3a2f5c9fde90b..223768fd6ec3faa61397119e973f4bfe41ba8a9a 100644 (file)
--- a/gpsbabel/coto.c
+++ b/gpsbabel/coto.c
@@ -238,7 +238,7 @@ coto_track_read(struct pdb *pdb)
                        rec->time -= 2082844800U;
                        wpt_tmp->creation_time = rec->time;
                }
-               route_add_wpt(trk_head, wpt_tmp);
+               track_add_wpt(trk_head, wpt_tmp);
        } 
 }
 

diff --git a/gpsbabel/cst.c b/gpsbabel/cst.c
index 9c815e92d9767e78a54a178c87e844c0e441f14d..d2b58863de54eb2779d7e91ee0e8eaed7633635a 100644 (file)
--- a/gpsbabel/cst.c
+++ b/gpsbabel/cst.c
@@ -73,7 +73,7 @@ cst_add_wpt(const route_head *track, waypoint *wpt)
                }
                route_add_wpt(temp_route, waypt_dupe(wpt));
        }
-       route_add_wpt((route_head *)track, (waypoint *)wpt);
+       track_add_wpt((route_head *)track, (waypoint *)wpt);
 }
 
 static char *

diff --git a/gpsbabel/cvttypes.c b/gpsbabel/cvttypes.c
index c39780b6fac379c69976f62e054d129ef49a57ed..91b114cce8ff5e57e898507aa90d21e6160f1367 100644 (file)
--- a/gpsbabel/cvttypes.c
+++ b/gpsbabel/cvttypes.c
@@ -60,7 +60,7 @@ cvttype_skeleton_process(void)
                if (wpt->creation_time <= 0) { 
                        wpt->creation_time  = ++tmstart; 
                }
-               route_add_wpt(my_trk_head, wpt);
+               track_add_wpt(my_trk_head, wpt);
 // if action == to rte
 //             waypt_del(wpt);
 //             route_add_wpt(my_rte_head, wpt);

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 790e09230eba8a9b863a5022c0715a9e5f96e3cd..0260ece128d7fe36afc0ca01430c48451cd3f091 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -383,6 +383,8 @@ route_head *route_head_alloc(void);
 void route_add (waypoint *);
 void route_add_wpt(route_head *rte, waypoint *wpt);
 void route_del_wpt(route_head *rte, waypoint *wpt);
+void track_add_wpt(route_head *rte, waypoint *wpt);
+void track_del_wpt(route_head *rte, waypoint *wpt);
 void route_add_head(route_head *rte);
 void route_del_head(route_head *rte);
 void route_reverse(const route_head *rte_hd);

diff --git a/gpsbabel/delgpl.c b/gpsbabel/delgpl.c
index 66097eb6098aa4b3f9c4084ad6bd2802a3973f47..2ad15bb978e659bbc04e2a022f8a1a7a516ae0e8 100644 (file)
--- a/gpsbabel/delgpl.c
+++ b/gpsbabel/delgpl.c
@@ -69,7 +69,7 @@ gpl_read(void)
                le_read64(&alt_feet, &gp.alt);
                wpt_tmp->altitude = alt_feet * .3048;
                wpt_tmp->creation_time = le_read32(&gp.tm);
-               route_add_wpt(track_head, wpt_tmp);
+               track_add_wpt(track_head, wpt_tmp);
        }
 }
 

diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c
index ad5cb80c6dd3d302834ae348a034d53968d2e0d7..3c414818e8d9d7855f112f09d8d45bb676e25122 100644 (file)
--- a/gpsbabel/garmin.c
+++ b/gpsbabel/garmin.c
@@ -312,7 +312,7 @@ track_read(void)
                wpt->shortname = xstrdup(array[i]->trk_ident);
                wpt->creation_time = array[i]->Time;
                
-               route_add_wpt(trk_head, wpt);
+               track_add_wpt(trk_head, wpt);
        }
 
        while(ntracks) {

diff --git a/gpsbabel/gdb.c b/gpsbabel/gdb.c
index 641776c7d931ec317431677a71d7c16d3e45ff47..8ee7b79dba2065d654dae7d51865e0bf0a2b8620 100644 (file)
--- a/gpsbabel/gdb.c
+++ b/gpsbabel/gdb.c
@@ -823,7 +823,7 @@ gdb_read_track(const size_t max_file_pos)
            
            gdb_is_validf(fabs(wpt->latitude) <= 90.0, prefix, "Invalid latitude (%f)", wpt->latitude);
            
-           route_add_wpt(track, wpt);
+           track_add_wpt(track, wpt);
        }
        
        gdb_fread(buff, 1);
@@ -873,7 +873,7 @@ gdb_read_data(void)
                    if (wptclass == 0)
                        waypt_add(wpt);
                    else if (gdb_via == 0)
-                       route_add_wpt(gdb_hidden, wpt);
+                       track_add_wpt(gdb_hidden, wpt);
                    else
                        waypt_free(wpt);
                }
@@ -1262,7 +1262,7 @@ gdb_write_waypt_cb(const waypoint *wpt)                   /* called by waypt_disp over all waypo
        
        fseek(fout, pos + reclen, SEEK_SET);
 
-       route_add_wpt(gdb_hidden, waypt_dupe(wpt));     /* add this point to our internal queue */
+       track_add_wpt(gdb_hidden, waypt_dupe(wpt));     /* add this point to our internal queue */
 }
 
 static void
@@ -1289,7 +1289,7 @@ gdb_write_rtewpt_cb(const waypoint *wpt)          /* called by waypt_disp (route points)
        
            fseek(fout, pos + reclen, SEEK_SET);
 
-           route_add_wpt(gdb_hidden, waypt_dupe(wpt)); /* add this point to our internal queue */
+           track_add_wpt(gdb_hidden, waypt_dupe(wpt)); /* add this point to our internal queue */
        }
 }
 

diff --git a/gpsbabel/glogbook.c b/gpsbabel/glogbook.c
index 2212c8bc4a22aada3ec34e3fad97ea8d8b781763..4467577216dc63aee559dfc8c3569437289a69fa 100644 (file)
--- a/gpsbabel/glogbook.c
+++ b/gpsbabel/glogbook.c
@@ -142,7 +142,7 @@ void        gl_trk_pnt_s(const char *args, const char **unused)
 
 void   gl_trk_pnt_e(const char *args, const char **unused)
 {
-       route_add_wpt(trk_head, wpt_tmp);
+       track_add_wpt(trk_head, wpt_tmp);
 }
 
 void   gl_trk_utc(const char *args, const char **unused)

diff --git a/gpsbabel/gpilots.c b/gpsbabel/gpilots.c
index e4ee0e2a0ee5239691d52892fea3f923c718e7ba..e4a3a277494a240faa4da6fdf8a38619dc264b82 100644 (file)
--- a/gpsbabel/gpilots.c
+++ b/gpsbabel/gpilots.c
@@ -333,7 +333,7 @@ data_read(void)
                                  wpt_tmp->creation_time = be_read32(&tp_cust->time) + 631065600;
                                  fi.i = be_read32(&tp_cust->alt);
                                  wpt_tmp->altitude = fi.f;
-                                 route_add_wpt(track_head, wpt_tmp);
+                                 track_add_wpt(track_head, wpt_tmp);
                                  tp_cust++;
                                }
                                break;
@@ -364,7 +364,7 @@ data_read(void)
                                  lat = be_read32(&tp_comp->lat);
                                  wpt_tmp->longitude = lon / 2147483648.0 * 180.0;
                                  wpt_tmp->latitude = lat / 2147483648.0 * 180.0;
-                                 route_add_wpt(track_head, wpt_tmp);
+                                 track_add_wpt(track_head, wpt_tmp);
                                  tp_comp++;
                                }
                                break;

diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c
index 755a55f4db6eea6136599dc1625d931dac4387dd..51d46e12fa45fc6ed83751d9aa66ea382302f704 100644 (file)
--- a/gpsbabel/gpx.c
+++ b/gpsbabel/gpx.c
@@ -900,7 +900,7 @@ gpx_end(void *data, const char *el)
        case tt_trk:
                break;
        case tt_trk_trkseg_trkpt:
-               route_add_wpt(trk_head, wpt_tmp);
+               track_add_wpt(trk_head, wpt_tmp);
                wpt_tmp = NULL;
                break;
        case tt_trk_desc:

diff --git a/gpsbabel/gtm.c b/gpsbabel/gtm.c
index 4d7e67f3d95a12adf1ff89cb01f94b1c4f49e278..86cdce5ea021f05eb1e5cb367b1512c65093653e 100644 (file)
--- a/gpsbabel/gtm.c
+++ b/gpsbabel/gtm.c
@@ -615,7 +615,7 @@ gtm_read(void)
                        if (!first_trk_head)
                                first_trk_head = trk_head;
                }
-               route_add_wpt(trk_head, wpt);
+               track_add_wpt(trk_head, wpt);
        }
 
        /* Tracklog styles */

diff --git a/gpsbabel/hiketech.c b/gpsbabel/hiketech.c
index d8e67c787fa04eeeeb2d3723c54d41d3cdbe5bf1..720c9e38f92b7209b8d4699edcfb1e2f9a0fd06c 100644 (file)
--- a/gpsbabel/hiketech.c
+++ b/gpsbabel/hiketech.c
@@ -240,7 +240,7 @@ void        ht_trk_pnt_s(const char *args, const char **unused)
 static
 void   ht_trk_pnt_e(const char *args, const char **unused)
 {
-       route_add_wpt(trk_head, wpt_tmp);
+       track_add_wpt(trk_head, wpt_tmp);
 }
 
 static

diff --git a/gpsbabel/igc.c b/gpsbabel/igc.c
index 0da923ac1d8f4e6159c636eab35d85b53780443e..0ff3e96acb8684e62ffd8f81ca3b5352a51bd13c 100644 (file)
--- a/gpsbabel/igc.c
+++ b/gpsbabel/igc.c
@@ -358,7 +358,7 @@ static void data_read(void)
            } else {
                pres_wpt->altitude = unknown_alt;
            }
-           route_add_wpt(pres_head, pres_wpt);
+           track_add_wpt(pres_head, pres_wpt);
 
            // Add the same waypoint with GNSS altitude to the second
            // track
@@ -370,7 +370,7 @@ static void data_read(void)
            } else {
                gnss_wpt->altitude = unknown_alt;
            }
-           route_add_wpt(gnss_head, gnss_wpt);
+           track_add_wpt(gnss_head, gnss_wpt);
            break;
 
        case rec_task:

diff --git a/gpsbabel/ignrando.c b/gpsbabel/ignrando.c
index 4b98822494c58f07fd6162697a09e452d883edf8..2c869f4223470d24f18f3f35cb5620d031e2c217 100644 (file)
--- a/gpsbabel/ignrando.c
+++ b/gpsbabel/ignrando.c
@@ -139,7 +139,7 @@ ignr_etape_end(const char *args, const char **attrv)
 {
        ignr_xml_error((track == NULL) || (wpt == NULL));
        
-       route_add_wpt(track, wpt);
+       track_add_wpt(track, wpt);
        wpt = NULL;
 }
 

diff --git a/gpsbabel/kml.c b/gpsbabel/kml.c
index 34a3a13d6ff62d81b2ac12e421d9be55c98848e4..41c7842a7a40a2f5e8dc5bc2436bf66936d1bfb0 100644 (file)
--- a/gpsbabel/kml.c
+++ b/gpsbabel/kml.c
@@ -175,7 +175,7 @@ void trk_coord(const char *args, const char **attrv)
                trkpt->longitude = lon;
                trkpt->altitude = alt;
 
-               route_add_wpt(trk_head, trkpt);
+               track_add_wpt(trk_head, trkpt);
 
                args += consumed;
        }

diff --git a/gpsbabel/lowranceusr.c b/gpsbabel/lowranceusr.c
index 9a97bcbbe4bcdff6c4c9bb98e65007822ae17122..cae2f6cf44a6fe9401c98523e049661a1a07af78 100644 (file)
--- a/gpsbabel/lowranceusr.c
+++ b/gpsbabel/lowranceusr.c
@@ -569,7 +569,7 @@ if (global_opts.debug_level >= 1)
                                        track_add_head(trk_tmp);
                                        trk_head = trk_tmp;
                                }
-                               route_add_wpt(trk_head, wpt_tmp);
+                               track_add_wpt(trk_head, wpt_tmp);
                        
 if (global_opts.debug_level >= 1)
        printf("LOWRANCE parse_trails: Trail pt lat %f lon %f\n", wpt_tmp->latitude, wpt_tmp->longitude);

diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c
index 7f41cf6d3630b3c544ef60339b15d581323ac74a..a6f5c3b82d39b5aba07b123d01695487f065e718 100644 (file)
--- a/gpsbabel/magproto.c
+++ b/gpsbabel/magproto.c
@@ -467,7 +467,7 @@ retry:
                        track_add_head(trk_head);
                }
 
-               route_add_wpt(trk_head, wpt);
+               track_add_wpt(trk_head, wpt);
        }
        if (strncmp(ibuf, "$PMGNRTE,", 7) == 0) {
                mag_rteparse(ibuf);

diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c
index ebea4cb18500acc91f59a6bc6b3c22cab1183dd1..71aca197ddffbdc7ee8cbfce2b3004c244dc68dd 100644 (file)
--- a/gpsbabel/mapsend.c
+++ b/gpsbabel/mapsend.c
@@ -272,7 +272,7 @@ mapsend_track_read(void)
                wpt_tmp->creation_time = time;
                wpt_tmp->centiseconds = centisecs;
                wpt_tmp->altitude = wpt_alt;
-               route_add_wpt(track_head, wpt_tmp);
+               track_add_wpt(track_head, wpt_tmp);
        }
 }
 
@@ -600,7 +600,6 @@ mapsend_wpt_write(void)
                }
                
                n = route_count();
-
                my_fwrite4(&n, mapsend_file_out);
        
                if (n)

diff --git a/gpsbabel/mapsource.c b/gpsbabel/mapsource.c
index 4fdf01b12d3d4e91cf6382d32f2a47a8f96398e5..703951ddf5bceaddb215fdbf340302c87c258b4d 100644 (file)
--- a/gpsbabel/mapsource.c
+++ b/gpsbabel/mapsource.c
@@ -1636,7 +1636,7 @@ mps_track_r(FILE *mps_file, int mps_ver, route_head **trk)
                thisWaypoint->centiseconds = 0;
                thisWaypoint->altitude = mps_altitude;
                thisWaypoint->depth = mps_depth;
-               route_add_wpt(track_head, thisWaypoint);
+               track_add_wpt(track_head, thisWaypoint);
 
        }               /* while (trk_count--) */
 

diff --git a/gpsbabel/nmea.c b/gpsbabel/nmea.c
index c892b175677cf1bb2215e2844c20b2982e41623c..68dc6d62bca7bf8666f37ee0b22bd12a52770dbf 100644 (file)
--- a/gpsbabel/nmea.c
+++ b/gpsbabel/nmea.c
@@ -278,7 +278,7 @@ gpgll_parse(char *ibuf)
        waypt->longitude = ddmm2degrees(lngdeg);
 
        curr_waypt = waypt;
-       route_add_wpt(trk_head, waypt);
+       track_add_wpt(trk_head, waypt);
 }
 
 static void
@@ -343,7 +343,7 @@ gpgga_parse(char *ibuf)
        }
 
        curr_waypt = waypt;
-       route_add_wpt(trk_head, waypt);
+       track_add_wpt(trk_head, waypt);
 }
 
 static void
@@ -413,7 +413,7 @@ gprmc_parse(char *ibuf)
        waypt->longitude = ddmm2degrees(lngdeg);
 
        curr_waypt = waypt;
-       route_add_wpt(trk_head, waypt);
+       track_add_wpt(trk_head, waypt);
 }
 
 static void

diff --git a/gpsbabel/ozi.c b/gpsbabel/ozi.c
index 7b6b8d8ce79b7db30da1c21118cd0c597cdff140..539018ada0df5053a112663661481a155398cbf5 100644 (file)
--- a/gpsbabel/ozi.c
+++ b/gpsbabel/ozi.c
@@ -642,7 +642,7 @@ data_read(void)
             switch (ozi_objective) {
             case trkdata:
                 if (linecount > 6) /* skipping over file header */
-                    route_add_wpt(trk_head, wpt_tmp);
+                    track_add_wpt(trk_head, wpt_tmp);
                 else
                     waypt_free(wpt_tmp);
                 break;

diff --git a/gpsbabel/pathaway.c b/gpsbabel/pathaway.c
index c4e0cda204828f3754f4436bab7a5638064f6691..326761b16cef446e34c376e55d13bd7a57d66bce 100644 (file)
--- a/gpsbabel/pathaway.c
+++ b/gpsbabel/pathaway.c
@@ -338,7 +338,7 @@ int ppdb_decode_tm(char *str, struct tm *tm)
 }
 
 static 
-int ppdb_read_wpt(const struct pdb *pdb_in, const struct pdb_record *pdb_rec, route_head *head)
+int ppdb_read_wpt(const struct pdb *pdb_in, const struct pdb_record *pdb_rec, route_head *head, int isRoute)
 {
        char *data, *str;
        double altfeet;
@@ -394,8 +394,10 @@ int ppdb_read_wpt(const struct pdb *pdb_in, const struct pdb_record *pdb_rec, ro
                    str = csv_lineparse(NULL, ",", """", line++);
                }
                
-               if (head)
+               if (head && isRoute )
                    route_add_wpt(head, wpt_tmp);
+               else if (head)
+                    track_add_wpt(head, wpt_tmp);
                else
                    waypt_add(wpt_tmp);
 
@@ -478,16 +480,16 @@ static void ppdb_read(void)
                track_head = route_head_alloc();
                track_add_head(track_head);
                track_head->rte_name = xstrdup(pdb_in->name);
-               ppdb_read_wpt(pdb_in, pdb_rec, track_head);
+               ppdb_read_wpt(pdb_in, pdb_rec, track_head, 0);
                break;
            case rtedata:
                route_head = route_head_alloc();
                route_add_head(route_head);
                route_head->rte_name = xstrdup(pdb_in->name);
-               ppdb_read_wpt(pdb_in, pdb_rec, route_head);
+               ppdb_read_wpt(pdb_in, pdb_rec, route_head, 1);
                break;
            case wptdata:
-               ppdb_read_wpt(pdb_in, pdb_rec, NULL);
+               ppdb_read_wpt(pdb_in, pdb_rec, NULL, 0);
                break;
        }
        

diff --git a/gpsbabel/pcx.c b/gpsbabel/pcx.c
index 0c5c34280df9973121dbaab3ec1207a06077bdce..1d76a3de118a7586631a8eb6ca5f07dea9f5ee90 100644 (file)
--- a/gpsbabel/pcx.c
+++ b/gpsbabel/pcx.c
@@ -206,7 +206,7 @@ data_read(void)
                                track->rte_name = xstrdup("Default");
                                track_add_head(track);
                        }
-                       route_add_wpt(track, wpt_tmp);
+                       track_add_wpt(track, wpt_tmp);
                        break;
                case 'U': 
                        read_as_degrees = ! strncmp("LAT LON DEG", ibuf + 3, 11);

diff --git a/gpsbabel/position.c b/gpsbabel/position.c
index 9fe7c26c3f9322d0aa8badd37895f7c95072a85b..7e96ad367ae2e233dee8c0c6eac03425c7d5e8f8 100644 (file)
--- a/gpsbabel/position.c
+++ b/gpsbabel/position.c
@@ -169,6 +169,9 @@ position_runqueue(queue *q, int nelems, int qtype)
                                        del = !!purge_duplicates;
                                        break;
                                case trkdata:
+                                       track_del_wpt(cur_rte, comp[i]);
+                                       del = !!purge_duplicates;
+                                       break;
                                case rtedata:
                                        route_del_wpt(cur_rte, comp[i]);
                                        del = !!purge_duplicates;
@@ -185,6 +188,9 @@ position_runqueue(queue *q, int nelems, int qtype)
                                        del = 0;
                                        break;
                                case trkdata:
+                                       track_del_wpt(cur_rte, comp[i]);
+                                       del = !!purge_duplicates;
+                                       break;
                                case rtedata:
                                        route_del_wpt(cur_rte, comp[i]);
                                        del = 0;
@@ -203,6 +209,8 @@ position_runqueue(queue *q, int nelems, int qtype)
                                waypt_free(comp[nelems-1]);
                                break;
                        case trkdata:
+                               track_del_wpt(cur_rte, comp[i]);
+                               break;
                        case rtedata:
                                route_del_wpt(cur_rte, comp[i]);
                                break;

diff --git a/gpsbabel/psitrex.c b/gpsbabel/psitrex.c
index c626b81c2571022fac2d4f1a0d66fb6471321c02..76d1992e35b13f12d917bb0c0083c1f991dcf520 100755 (executable)
--- a/gpsbabel/psitrex.c
+++ b/gpsbabel/psitrex.c
@@ -592,7 +592,7 @@ psit_track_r(FILE *psit_file, route_head **trk)
 
                        thisWaypoint->creation_time = dateTime;
                        thisWaypoint->centiseconds = 0;
-                       route_add_wpt(track_head, thisWaypoint);
+                       track_add_wpt(track_head, thisWaypoint);
 
                        if (feof(psit_file)) break;
 

diff --git a/gpsbabel/reference/cototesttrack.csv b/gpsbabel/reference/cototesttrack.csv
index d5aee706c1ee5827354c4ea0590212d792318ce5..d62e71c48c7ec5a505a61fa436d12a9ed7d9f7ba 100644 (file)
--- a/gpsbabel/reference/cototesttrack.csv
+++ b/gpsbabel/reference/cototesttrack.csv
@@ -1,135 +1,135 @@
-48.557327,8.961583,,RPT001,RPT001,,395,       1.9,1122371309,       0.8,       1.2,       1.5,10,3d
-48.557327,8.961585,,RPT002,RPT002,,395,       0.5,1122371311,       0.8,       1.2,       1.5,9,3d
-48.557353,8.961542,,RPT003,RPT003,,395,       1.2,1122371313,       0.9,       1.3,       1.6,10,3d
-48.557388,8.961457,,RPT004,RPT004,,395,       3.5,1122371315,       0.9,       1.3,       1.6,9,3d
-48.557395,8.961412,,RPT005,RPT005,,395,       3.7,1122371316,       0.9,       1.3,       1.6,10,3d
-48.557390,8.961370,,RPT006,RPT006,,395,       3.0,1122371317,       0.8,       1.2,       1.5,10,3d
-48.557360,8.961295,,RPT007,RPT007,,395,       3.3,1122371319,       0.9,       1.4,       1.7,9,3d
-48.557350,8.961223,,RPT008,RPT008,,395,       2.6,1122371321,       0.8,       1.2,       1.5,10,3d
-48.557385,8.961148,,RPT009,RPT009,,396,       2.4,1122371324,       1.0,       1.6,       1.9,9,3d
-48.557427,8.961158,,RPT010,RPT010,,395,       1.8,1122371326,       0.8,       1.2,       1.5,10,3d
-48.557473,8.961232,,RPT011,RPT011,,396,       3.2,1122371328,       0.8,       1.2,       1.5,10,3d
-48.557523,8.961327,,RPT012,RPT012,,396,       4.3,1122371330,       1.0,       1.6,       1.9,9,3d
-48.557547,8.961410,,RPT013,RPT013,,396,       3.0,1122371332,       0.8,       1.2,       1.5,10,3d
-48.557493,8.961597,,RPT014,RPT014,,396,       5.2,1122371335,       1.2,       2.0,       2.3,9,3d
-48.557405,8.961743,,RPT015,RPT015,,396,       6.8,1122371337,       0.8,       1.2,       1.5,10,3d
-48.557295,8.961937,,RPT016,RPT016,,395,       8.9,1122371339,       0.8,       1.2,       1.5,10,3d
-48.557295,8.961937,,RPT017,RPT017,,395,       8.9,1122371339,       0.8,       1.2,       1.5,10,3d
-48.557113,8.962262,,RPT018,RPT018,,395,      10.4,1122371342,       0.8,       1.2,       1.5,10,3d
-48.557050,8.962375,,RPT019,RPT019,,395,      10.8,1122371343,       0.8,       1.2,       1.5,10,3d
-48.556857,8.962722,,RPT020,RPT020,,395,      11.1,1122371346,       1.2,       1.5,       1.9,7,3d
-48.556725,8.962953,,RPT021,RPT021,,395,      11.3,1122371348,       1.4,       2.3,       2.7,6,3d
-48.556658,8.963070,,RPT022,RPT022,,395,      11.3,1122371349,       1.4,       2.3,       2.7,6,3d
-48.556522,8.963310,,RPT023,RPT023,,395,      11.3,1122371351,       1.2,       2.2,       2.5,7,3d
-48.556377,8.963557,,RPT024,RPT024,,394,      11.9,1122371353,       1.2,       2.0,       2.3,8,3d
-48.556212,8.963793,,RPT025,RPT025,,394,      12.4,1122371355,       1.4,       2.0,       2.5,5,3d
-48.556020,8.963990,,RPT026,RPT026,,393,      13.1,1122371357,       1.3,       2.3,       2.7,6,3d
-48.555918,8.964075,,RPT027,RPT027,,393,      12.8,1122371358,       1.3,       2.0,       2.4,5,3d
-48.555717,8.964222,,RPT028,RPT028,,393,      12.4,1122371360,       3.9,       6.4,       7.5,4,3d
-48.555523,8.964363,,RPT029,RPT029,,392,      12.2,1122371362,      30.7,      41.0,      51.3,4,2d
-48.555345,8.964542,,RPT030,RPT030,,392,      11.6,1122371364,       1.0,       1.6,       1.9,9,3d
-48.555177,8.964760,,RPT031,RPT031,,392,      12.5,1122371366,       1.2,       1.9,       2.3,6,3d
-48.555020,8.964978,,RPT032,RPT032,,392,      12.2,1122371368,       1.4,       2.3,       2.7,7,3d
-48.554947,8.965077,,RPT033,RPT033,,392,      11.0,1122371369,       1.2,       2.2,       2.5,7,3d
-48.554795,8.965253,,RPT034,RPT034,,392,      10.7,1122371371,       1.4,       2.4,       2.7,6,3d
-48.554627,8.965418,,RPT035,RPT035,,391,      11.3,1122371373,       1.3,       2.8,       3.1,6,3d
-48.554448,8.965578,,RPT036,RPT036,,391,      11.4,1122371375,       3.2,       3.5,       4.7,4,3d
-48.554302,8.965727,,RPT037,RPT037,,390,      10.7,1122371377,       1.7,       2.3,       2.9,5,3d
-48.554215,8.965882,,RPT038,RPT038,,391,       8.3,1122371379,       1.2,       2.2,       2.5,7,3d
-48.554243,8.966045,,RPT039,RPT039,,391,       6.5,1122371381,       1.3,       2.0,       2.4,7,3d
-48.554282,8.966232,,RPT040,RPT040,,391,       6.9,1122371383,       1.5,       4.1,       4.3,5,3d
-48.554318,8.966453,,RPT041,RPT041,,391,       8.4,1122371385,       1.4,       2.4,       2.7,6,3d
-48.554350,8.966680,,RPT042,RPT042,,392,       8.5,1122371387,       1.4,       2.5,       2.9,6,3d
-48.554378,8.966915,,RPT043,RPT043,,392,       8.8,1122371389,       1.5,       4.1,       4.3,5,3d
-48.554408,8.967123,,RPT044,RPT044,,393,       8.6,1122371391,       2.1,       2.3,       3.1,5,3d
-48.554463,8.967297,,RPT045,RPT045,,394,       7.3,1122371393,       1.2,       1.8,       2.2,7,3d
-48.554517,8.967438,,RPT046,RPT046,,395,       6.4,1122371395,       1.2,       1.9,       2.3,7,3d
-48.554565,8.967590,,RPT047,RPT047,,395,       6.0,1122371397,       1.2,       1.9,       2.2,7,3d
-48.554615,8.967743,,RPT048,RPT048,,395,       6.4,1122371399,       1.4,       2.3,       2.7,6,3d
-48.554700,8.967838,,RPT049,RPT049,,396,       6.1,1122371401,       1.3,       2.3,       2.7,7,3d
-48.554800,8.967820,,RPT050,RPT050,,397,       5.5,1122371403,       1.2,       2.0,       2.3,8,3d
-48.554897,8.967800,,RPT051,RPT051,,396,       5.5,1122371405,       2.6,       3.1,       4.1,6,3d
-48.555007,8.967795,,RPT052,RPT052,,396,       5.6,1122371407,       2.4,       3.1,       3.9,6,3d
-48.555125,8.967822,,RPT053,RPT053,,396,       6.5,1122371409,       2.3,       2.2,       3.1,6,3d
-48.555218,8.967930,,RPT054,RPT054,,397,       6.6,1122371411,       0.9,       1.3,       1.6,8,3d
-48.555298,8.968085,,RPT055,RPT055,,399,       7.2,1122371413,       2.1,       2.3,       3.1,5,3d
-48.555385,8.968235,,RPT056,RPT056,,400,       7.2,1122371415,       1.2,       1.8,       2.2,7,3d
-48.555455,8.968420,,RPT057,RPT057,,401,       7.5,1122371417,       1.4,       2.3,       2.7,6,3d
-48.555515,8.968630,,RPT058,RPT058,,402,       8.4,1122371419,       1.4,       2.3,       2.7,6,3d
-48.555562,8.968847,,RPT059,RPT059,,403,       8.5,1122371421,       1.2,       1.8,       2.2,7,3d
-48.555613,8.969055,,RPT060,RPT060,,403,       8.4,1122371423,       1.2,       1.8,       2.2,7,3d
-48.555665,8.969248,,RPT061,RPT061,,403,       7.9,1122371425,       1.4,       2.3,       2.7,6,3d
-48.555727,8.969428,,RPT062,RPT062,,403,       7.4,1122371427,       1.4,       2.3,       2.7,6,3d
-48.555790,8.969582,,RPT063,RPT063,,403,       6.8,1122371429,       1.4,       2.3,       2.7,6,3d
-48.555870,8.969733,,RPT064,RPT064,,404,       6.7,1122371431,       1.1,       1.6,       2.0,8,3d
-48.555958,8.969892,,RPT065,RPT065,,404,       7.5,1122371433,       0.9,       1.3,       1.6,9,3d
-48.556038,8.970065,,RPT066,RPT066,,404,       7.7,1122371435,       1.3,       1.8,       2.2,7,3d
-48.556113,8.970243,,RPT067,RPT067,,404,       7.8,1122371437,       1.3,       1.8,       2.2,7,3d
-48.556180,8.970410,,RPT068,RPT068,,404,       7.5,1122371439,       1.4,       2.3,       2.7,6,3d
-48.556238,8.970570,,RPT069,RPT069,,404,       6.8,1122371441,       0.9,       1.4,       1.7,8,3d
-48.556307,8.970727,,RPT070,RPT070,,404,       6.9,1122371443,       1.3,       1.8,       2.2,7,3d
-48.556397,8.970867,,RPT071,RPT071,,404,       7.2,1122371445,       1.3,       2.3,       2.7,7,3d
-48.556498,8.970997,,RPT072,RPT072,,404,       7.4,1122371447,       1.5,       4.1,       4.4,5,3d
-48.556607,8.971127,,RPT073,RPT073,,403,       7.6,1122371449,       1.5,       2.3,       2.7,6,3d
-48.556720,8.971252,,RPT074,RPT074,,403,       7.8,1122371451,       1.3,       2.8,       3.1,6,3d
-48.556835,8.971373,,RPT075,RPT075,,404,       7.8,1122371453,       1.1,       1.7,       2.0,8,3d
-48.556948,8.971477,,RPT076,RPT076,,404,       7.6,1122371455,       1.1,       1.6,       2.0,8,3d
-48.557075,8.971538,,RPT077,RPT077,,406,       7.2,1122371457,       1.6,       1.8,       2.4,8,3d
-48.557210,8.971575,,RPT078,RPT078,,407,       7.3,1122371459,       1.2,       2.0,       2.3,8,3d
-48.557345,8.971608,,RPT079,RPT079,,407,       7.7,1122371461,       1.0,       1.6,       1.9,9,3d
-48.557470,8.971637,,RPT080,RPT080,,407,       7.2,1122371463,       1.1,       1.7,       2.0,8,3d
-48.557538,8.971660,,RPT081,RPT081,,406,       5.4,1122371465,       1.1,       1.7,       2.0,8,3d
-48.557570,8.971673,,RPT082,RPT082,,406,       2.2,1122371467,       0.9,       1.4,       1.7,9,3d
-48.557622,8.971690,,RPT083,RPT083,,406,       2.5,1122371469,       1.3,       2.8,       3.1,6,3d
-48.557678,8.971717,,RPT084,RPT084,,405,       3.4,1122371471,       1.5,       2.3,       2.7,6,3d
-48.557730,8.971812,,RPT085,RPT085,,406,       3.9,1122371473,       1.2,       1.8,       2.2,7,3d
-48.557775,8.971957,,RPT086,RPT086,,407,       5.9,1122371475,       0.9,       1.3,       1.6,9,3d
-48.557828,8.972137,,RPT087,RPT087,,409,       6.8,1122371477,       1.1,       1.6,       2.0,8,3d
-48.557883,8.972347,,RPT088,RPT088,,409,       8.3,1122371479,       1.0,       1.5,       1.7,8,3d
-48.557937,8.972573,,RPT089,RPT089,,409,       8.7,1122371481,       1.0,       1.5,       1.8,7,3d
-48.558018,8.972813,,RPT090,RPT090,,411,       9.4,1122371483,       1.3,       1.8,       2.3,7,3d
-48.558095,8.973078,,RPT091,RPT091,,413,      10.5,1122371485,       1.3,       1.8,       2.3,7,3d
-48.558175,8.973340,,RPT092,RPT092,,414,      10.7,1122371487,       1.3,       1.8,       2.3,7,3d
-48.558255,8.973603,,RPT093,RPT093,,416,      10.6,1122371489,       1.0,       1.5,       1.7,8,3d
-48.558335,8.973867,,RPT094,RPT094,,416,      10.7,1122371491,       1.3,       1.8,       2.3,7,3d
-48.558420,8.974128,,RPT095,RPT095,,417,      10.6,1122371493,       1.9,       2.0,       2.7,6,3d
-48.558505,8.974393,,RPT096,RPT096,,418,      10.7,1122371495,       1.5,       2.3,       2.7,6,3d
-48.558592,8.974660,,RPT097,RPT097,,419,      10.9,1122371497,       1.3,       1.8,       2.3,7,3d
-48.558677,8.974927,,RPT098,RPT098,,420,      10.9,1122371499,       1.3,       1.8,       2.3,7,3d
-48.558772,8.975185,,RPT099,RPT099,,422,      10.8,1122371501,       0.9,       1.3,       1.6,9,3d
-48.558868,8.975437,,RPT100,RPT100,,423,      10.7,1122371503,       1.3,       1.9,       2.3,6,3d
-48.558970,8.975678,,RPT101,RPT101,,424,      10.6,1122371505,       1.0,       1.5,       1.8,7,3d
-48.559053,8.975923,,RPT102,RPT102,,426,      10.4,1122371507,       1.2,       1.8,       2.2,6,3d
-48.559093,8.976192,,RPT103,RPT103,,427,       9.6,1122371509,       1.0,       1.6,       1.9,9,3d
-48.559093,8.976475,,RPT104,RPT104,,429,      10.4,1122371511,       1.0,       1.6,       1.9,9,3d
-48.559070,8.976762,,RPT105,RPT105,,432,      10.6,1122371513,       0.8,       1.2,       1.5,10,3d
-48.559052,8.977048,,RPT106,RPT106,,434,      10.7,1122371515,       0.9,       1.4,       1.7,9,3d
-48.559067,8.977337,,RPT107,RPT107,,436,      10.6,1122371517,       0.9,       1.4,       1.7,9,3d
-48.559103,8.977623,,RPT108,RPT108,,437,      10.7,1122371519,       1.2,       1.8,       2.2,7,3d
-48.559152,8.977908,,RPT109,RPT109,,439,      10.7,1122371521,       1.2,       1.8,       2.2,7,3d
-48.559203,8.978187,,RPT110,RPT110,,440,      10.7,1122371523,       2.3,       2.1,       3.1,6,3d
-48.559275,8.978455,,RPT111,RPT111,,442,      10.8,1122371525,       1.0,       1.6,       1.9,9,3d
-48.559373,8.978698,,RPT112,RPT112,,444,      10.6,1122371527,       1.0,       1.6,       1.9,9,3d
-48.559490,8.978930,,RPT113,RPT113,,446,      10.6,1122371529,       0.9,       1.3,       1.6,8,3d
-48.559628,8.979135,,RPT114,RPT114,,448,      10.7,1122371531,       1.0,       1.6,       1.9,9,3d
-48.559780,8.979312,,RPT115,RPT115,,449,      10.6,1122371533,       1.2,       2.0,       2.3,8,3d
-48.559935,8.979483,,RPT116,RPT116,,451,      10.5,1122371535,       1.0,       1.6,       1.9,9,3d
-48.560095,8.979653,,RPT117,RPT117,,453,      10.7,1122371537,       1.0,       1.6,       1.9,9,3d
-48.560253,8.979823,,RPT118,RPT118,,455,      10.7,1122371539,       1.0,       1.6,       1.9,9,3d
-48.560413,8.979993,,RPT119,RPT119,,456,      10.8,1122371541,       1.7,       1.8,       2.4,8,3d
-48.560567,8.980157,,RPT120,RPT120,,458,      10.5,1122371543,       1.7,       1.8,       2.4,8,3d
-48.560713,8.980332,,RPT121,RPT121,,460,      10.3,1122371545,       1.7,       1.8,       2.4,8,3d
-48.560833,8.980553,,RPT122,RPT122,,462,      10.3,1122371547,       1.2,       2.0,       2.3,8,3d
-48.560907,8.980828,,RPT123,RPT123,,463,      10.8,1122371549,       2.4,       3.1,       3.9,7,3d
-48.560930,8.981137,,RPT124,RPT124,,465,      11.3,1122371551,       1.2,       2.0,       2.3,8,3d
-48.560932,8.981452,,RPT125,RPT125,,467,      11.5,1122371553,       1.3,       2.3,       2.7,7,3d
-48.560948,8.981762,,RPT126,RPT126,,469,      11.5,1122371555,       1.3,       2.3,       2.7,7,3d
-48.560988,8.982068,,RPT127,RPT127,,471,      11.5,1122371557,       1.5,       4.1,       4.4,5,3d
-48.561040,8.982372,,RPT128,RPT128,,473,      11.5,1122371559,       1.2,       1.8,       2.2,6,3d
-48.561098,8.982663,,RPT129,RPT129,,474,      11.3,1122371561,       1.3,       1.9,       2.3,6,3d
-48.561193,8.982927,,RPT130,RPT130,,475,      11.0,1122371563,       1.1,       1.6,       2.0,8,3d
-48.561270,8.983170,,RPT131,RPT131,,476,      10.4,1122371565,       0.9,       1.3,       1.6,9,3d
-48.561337,8.983385,,RPT132,RPT132,,477,       8.9,1122371567,       0.8,       1.3,       1.5,9,3d
-48.561395,8.983598,,RPT133,RPT133,,477,       8.6,1122371569,       0.9,       1.3,       1.6,9,3d
-48.561447,8.983807,,RPT134,RPT134,,477,       8.4,1122371571,       1.1,       1.6,       2.0,8,3d
-48.561483,8.983955,,RPT135,RPT135,,477,       6.6,1122371573,       1.1,       1.8,       2.1,8,3d
+48.557327,8.961583,,,,,395,       1.9,1122371309,       0.8,       1.2,       1.5,10,3d
+48.557327,8.961585,,,,,395,       0.5,1122371311,       0.8,       1.2,       1.5,9,3d
+48.557353,8.961542,,,,,395,       1.2,1122371313,       0.9,       1.3,       1.6,10,3d
+48.557388,8.961457,,,,,395,       3.5,1122371315,       0.9,       1.3,       1.6,9,3d
+48.557395,8.961412,,,,,395,       3.7,1122371316,       0.9,       1.3,       1.6,10,3d
+48.557390,8.961370,,,,,395,       3.0,1122371317,       0.8,       1.2,       1.5,10,3d
+48.557360,8.961295,,,,,395,       3.3,1122371319,       0.9,       1.4,       1.7,9,3d
+48.557350,8.961223,,,,,395,       2.6,1122371321,       0.8,       1.2,       1.5,10,3d
+48.557385,8.961148,,,,,396,       2.4,1122371324,       1.0,       1.6,       1.9,9,3d
+48.557427,8.961158,,,,,395,       1.8,1122371326,       0.8,       1.2,       1.5,10,3d
+48.557473,8.961232,,,,,396,       3.2,1122371328,       0.8,       1.2,       1.5,10,3d
+48.557523,8.961327,,,,,396,       4.3,1122371330,       1.0,       1.6,       1.9,9,3d
+48.557547,8.961410,,,,,396,       3.0,1122371332,       0.8,       1.2,       1.5,10,3d
+48.557493,8.961597,,,,,396,       5.2,1122371335,       1.2,       2.0,       2.3,9,3d
+48.557405,8.961743,,,,,396,       6.8,1122371337,       0.8,       1.2,       1.5,10,3d
+48.557295,8.961937,,,,,395,       8.9,1122371339,       0.8,       1.2,       1.5,10,3d
+48.557295,8.961937,,,,,395,       8.9,1122371339,       0.8,       1.2,       1.5,10,3d
+48.557113,8.962262,,,,,395,      10.4,1122371342,       0.8,       1.2,       1.5,10,3d
+48.557050,8.962375,,,,,395,      10.8,1122371343,       0.8,       1.2,       1.5,10,3d
+48.556857,8.962722,,,,,395,      11.1,1122371346,       1.2,       1.5,       1.9,7,3d
+48.556725,8.962953,,,,,395,      11.3,1122371348,       1.4,       2.3,       2.7,6,3d
+48.556658,8.963070,,,,,395,      11.3,1122371349,       1.4,       2.3,       2.7,6,3d
+48.556522,8.963310,,,,,395,      11.3,1122371351,       1.2,       2.2,       2.5,7,3d
+48.556377,8.963557,,,,,394,      11.9,1122371353,       1.2,       2.0,       2.3,8,3d
+48.556212,8.963793,,,,,394,      12.4,1122371355,       1.4,       2.0,       2.5,5,3d
+48.556020,8.963990,,,,,393,      13.1,1122371357,       1.3,       2.3,       2.7,6,3d
+48.555918,8.964075,,,,,393,      12.8,1122371358,       1.3,       2.0,       2.4,5,3d
+48.555717,8.964222,,,,,393,      12.4,1122371360,       3.9,       6.4,       7.5,4,3d
+48.555523,8.964363,,,,,392,      12.2,1122371362,      30.7,      41.0,      51.3,4,2d
+48.555345,8.964542,,,,,392,      11.6,1122371364,       1.0,       1.6,       1.9,9,3d
+48.555177,8.964760,,,,,392,      12.5,1122371366,       1.2,       1.9,       2.3,6,3d
+48.555020,8.964978,,,,,392,      12.2,1122371368,       1.4,       2.3,       2.7,7,3d
+48.554947,8.965077,,,,,392,      11.0,1122371369,       1.2,       2.2,       2.5,7,3d
+48.554795,8.965253,,,,,392,      10.7,1122371371,       1.4,       2.4,       2.7,6,3d
+48.554627,8.965418,,,,,391,      11.3,1122371373,       1.3,       2.8,       3.1,6,3d
+48.554448,8.965578,,,,,391,      11.4,1122371375,       3.2,       3.5,       4.7,4,3d
+48.554302,8.965727,,,,,390,      10.7,1122371377,       1.7,       2.3,       2.9,5,3d
+48.554215,8.965882,,,,,391,       8.3,1122371379,       1.2,       2.2,       2.5,7,3d
+48.554243,8.966045,,,,,391,       6.5,1122371381,       1.3,       2.0,       2.4,7,3d
+48.554282,8.966232,,,,,391,       6.9,1122371383,       1.5,       4.1,       4.3,5,3d
+48.554318,8.966453,,,,,391,       8.4,1122371385,       1.4,       2.4,       2.7,6,3d
+48.554350,8.966680,,,,,392,       8.5,1122371387,       1.4,       2.5,       2.9,6,3d
+48.554378,8.966915,,,,,392,       8.8,1122371389,       1.5,       4.1,       4.3,5,3d
+48.554408,8.967123,,,,,393,       8.6,1122371391,       2.1,       2.3,       3.1,5,3d
+48.554463,8.967297,,,,,394,       7.3,1122371393,       1.2,       1.8,       2.2,7,3d
+48.554517,8.967438,,,,,395,       6.4,1122371395,       1.2,       1.9,       2.3,7,3d
+48.554565,8.967590,,,,,395,       6.0,1122371397,       1.2,       1.9,       2.2,7,3d
+48.554615,8.967743,,,,,395,       6.4,1122371399,       1.4,       2.3,       2.7,6,3d
+48.554700,8.967838,,,,,396,       6.1,1122371401,       1.3,       2.3,       2.7,7,3d
+48.554800,8.967820,,,,,397,       5.5,1122371403,       1.2,       2.0,       2.3,8,3d
+48.554897,8.967800,,,,,396,       5.5,1122371405,       2.6,       3.1,       4.1,6,3d
+48.555007,8.967795,,,,,396,       5.6,1122371407,       2.4,       3.1,       3.9,6,3d
+48.555125,8.967822,,,,,396,       6.5,1122371409,       2.3,       2.2,       3.1,6,3d
+48.555218,8.967930,,,,,397,       6.6,1122371411,       0.9,       1.3,       1.6,8,3d
+48.555298,8.968085,,,,,399,       7.2,1122371413,       2.1,       2.3,       3.1,5,3d
+48.555385,8.968235,,,,,400,       7.2,1122371415,       1.2,       1.8,       2.2,7,3d
+48.555455,8.968420,,,,,401,       7.5,1122371417,       1.4,       2.3,       2.7,6,3d
+48.555515,8.968630,,,,,402,       8.4,1122371419,       1.4,       2.3,       2.7,6,3d
+48.555562,8.968847,,,,,403,       8.5,1122371421,       1.2,       1.8,       2.2,7,3d
+48.555613,8.969055,,,,,403,       8.4,1122371423,       1.2,       1.8,       2.2,7,3d
+48.555665,8.969248,,,,,403,       7.9,1122371425,       1.4,       2.3,       2.7,6,3d
+48.555727,8.969428,,,,,403,       7.4,1122371427,       1.4,       2.3,       2.7,6,3d
+48.555790,8.969582,,,,,403,       6.8,1122371429,       1.4,       2.3,       2.7,6,3d
+48.555870,8.969733,,,,,404,       6.7,1122371431,       1.1,       1.6,       2.0,8,3d
+48.555958,8.969892,,,,,404,       7.5,1122371433,       0.9,       1.3,       1.6,9,3d
+48.556038,8.970065,,,,,404,       7.7,1122371435,       1.3,       1.8,       2.2,7,3d
+48.556113,8.970243,,,,,404,       7.8,1122371437,       1.3,       1.8,       2.2,7,3d
+48.556180,8.970410,,,,,404,       7.5,1122371439,       1.4,       2.3,       2.7,6,3d
+48.556238,8.970570,,,,,404,       6.8,1122371441,       0.9,       1.4,       1.7,8,3d
+48.556307,8.970727,,,,,404,       6.9,1122371443,       1.3,       1.8,       2.2,7,3d
+48.556397,8.970867,,,,,404,       7.2,1122371445,       1.3,       2.3,       2.7,7,3d
+48.556498,8.970997,,,,,404,       7.4,1122371447,       1.5,       4.1,       4.4,5,3d
+48.556607,8.971127,,,,,403,       7.6,1122371449,       1.5,       2.3,       2.7,6,3d
+48.556720,8.971252,,,,,403,       7.8,1122371451,       1.3,       2.8,       3.1,6,3d
+48.556835,8.971373,,,,,404,       7.8,1122371453,       1.1,       1.7,       2.0,8,3d
+48.556948,8.971477,,,,,404,       7.6,1122371455,       1.1,       1.6,       2.0,8,3d
+48.557075,8.971538,,,,,406,       7.2,1122371457,       1.6,       1.8,       2.4,8,3d
+48.557210,8.971575,,,,,407,       7.3,1122371459,       1.2,       2.0,       2.3,8,3d
+48.557345,8.971608,,,,,407,       7.7,1122371461,       1.0,       1.6,       1.9,9,3d
+48.557470,8.971637,,,,,407,       7.2,1122371463,       1.1,       1.7,       2.0,8,3d
+48.557538,8.971660,,,,,406,       5.4,1122371465,       1.1,       1.7,       2.0,8,3d
+48.557570,8.971673,,,,,406,       2.2,1122371467,       0.9,       1.4,       1.7,9,3d
+48.557622,8.971690,,,,,406,       2.5,1122371469,       1.3,       2.8,       3.1,6,3d
+48.557678,8.971717,,,,,405,       3.4,1122371471,       1.5,       2.3,       2.7,6,3d
+48.557730,8.971812,,,,,406,       3.9,1122371473,       1.2,       1.8,       2.2,7,3d
+48.557775,8.971957,,,,,407,       5.9,1122371475,       0.9,       1.3,       1.6,9,3d
+48.557828,8.972137,,,,,409,       6.8,1122371477,       1.1,       1.6,       2.0,8,3d
+48.557883,8.972347,,,,,409,       8.3,1122371479,       1.0,       1.5,       1.7,8,3d
+48.557937,8.972573,,,,,409,       8.7,1122371481,       1.0,       1.5,       1.8,7,3d
+48.558018,8.972813,,,,,411,       9.4,1122371483,       1.3,       1.8,       2.3,7,3d
+48.558095,8.973078,,,,,413,      10.5,1122371485,       1.3,       1.8,       2.3,7,3d
+48.558175,8.973340,,,,,414,      10.7,1122371487,       1.3,       1.8,       2.3,7,3d
+48.558255,8.973603,,,,,416,      10.6,1122371489,       1.0,       1.5,       1.7,8,3d
+48.558335,8.973867,,,,,416,      10.7,1122371491,       1.3,       1.8,       2.3,7,3d
+48.558420,8.974128,,,,,417,      10.6,1122371493,       1.9,       2.0,       2.7,6,3d
+48.558505,8.974393,,,,,418,      10.7,1122371495,       1.5,       2.3,       2.7,6,3d
+48.558592,8.974660,,,,,419,      10.9,1122371497,       1.3,       1.8,       2.3,7,3d
+48.558677,8.974927,,,,,420,      10.9,1122371499,       1.3,       1.8,       2.3,7,3d
+48.558772,8.975185,,,,,422,      10.8,1122371501,       0.9,       1.3,       1.6,9,3d
+48.558868,8.975437,,,,,423,      10.7,1122371503,       1.3,       1.9,       2.3,6,3d
+48.558970,8.975678,,,,,424,      10.6,1122371505,       1.0,       1.5,       1.8,7,3d
+48.559053,8.975923,,,,,426,      10.4,1122371507,       1.2,       1.8,       2.2,6,3d
+48.559093,8.976192,,,,,427,       9.6,1122371509,       1.0,       1.6,       1.9,9,3d
+48.559093,8.976475,,,,,429,      10.4,1122371511,       1.0,       1.6,       1.9,9,3d
+48.559070,8.976762,,,,,432,      10.6,1122371513,       0.8,       1.2,       1.5,10,3d
+48.559052,8.977048,,,,,434,      10.7,1122371515,       0.9,       1.4,       1.7,9,3d
+48.559067,8.977337,,,,,436,      10.6,1122371517,       0.9,       1.4,       1.7,9,3d
+48.559103,8.977623,,,,,437,      10.7,1122371519,       1.2,       1.8,       2.2,7,3d
+48.559152,8.977908,,,,,439,      10.7,1122371521,       1.2,       1.8,       2.2,7,3d
+48.559203,8.978187,,,,,440,      10.7,1122371523,       2.3,       2.1,       3.1,6,3d
+48.559275,8.978455,,,,,442,      10.8,1122371525,       1.0,       1.6,       1.9,9,3d
+48.559373,8.978698,,,,,444,      10.6,1122371527,       1.0,       1.6,       1.9,9,3d
+48.559490,8.978930,,,,,446,      10.6,1122371529,       0.9,       1.3,       1.6,8,3d
+48.559628,8.979135,,,,,448,      10.7,1122371531,       1.0,       1.6,       1.9,9,3d
+48.559780,8.979312,,,,,449,      10.6,1122371533,       1.2,       2.0,       2.3,8,3d
+48.559935,8.979483,,,,,451,      10.5,1122371535,       1.0,       1.6,       1.9,9,3d
+48.560095,8.979653,,,,,453,      10.7,1122371537,       1.0,       1.6,       1.9,9,3d
+48.560253,8.979823,,,,,455,      10.7,1122371539,       1.0,       1.6,       1.9,9,3d
+48.560413,8.979993,,,,,456,      10.8,1122371541,       1.7,       1.8,       2.4,8,3d
+48.560567,8.980157,,,,,458,      10.5,1122371543,       1.7,       1.8,       2.4,8,3d
+48.560713,8.980332,,,,,460,      10.3,1122371545,       1.7,       1.8,       2.4,8,3d
+48.560833,8.980553,,,,,462,      10.3,1122371547,       1.2,       2.0,       2.3,8,3d
+48.560907,8.980828,,,,,463,      10.8,1122371549,       2.4,       3.1,       3.9,7,3d
+48.560930,8.981137,,,,,465,      11.3,1122371551,       1.2,       2.0,       2.3,8,3d
+48.560932,8.981452,,,,,467,      11.5,1122371553,       1.3,       2.3,       2.7,7,3d
+48.560948,8.981762,,,,,469,      11.5,1122371555,       1.3,       2.3,       2.7,7,3d
+48.560988,8.982068,,,,,471,      11.5,1122371557,       1.5,       4.1,       4.4,5,3d
+48.561040,8.982372,,,,,473,      11.5,1122371559,       1.2,       1.8,       2.2,6,3d
+48.561098,8.982663,,,,,474,      11.3,1122371561,       1.3,       1.9,       2.3,6,3d
+48.561193,8.982927,,,,,475,      11.0,1122371563,       1.1,       1.6,       2.0,8,3d
+48.561270,8.983170,,,,,476,      10.4,1122371565,       0.9,       1.3,       1.6,9,3d
+48.561337,8.983385,,,,,477,       8.9,1122371567,       0.8,       1.3,       1.5,9,3d
+48.561395,8.983598,,,,,477,       8.6,1122371569,       0.9,       1.3,       1.6,9,3d
+48.561447,8.983807,,,,,477,       8.4,1122371571,       1.1,       1.6,       2.0,8,3d
+48.561483,8.983955,,,,,477,       6.6,1122371573,       1.1,       1.8,       2.1,8,3d

diff --git a/gpsbabel/reference/track/fugawi.txt b/gpsbabel/reference/track/fugawi.txt
index 8bca8dc5067616af47b4fa3887210e05db6a286f..ba823789105f091de21af4cc159b49a1e1b9879e 100644 (file)
--- a/gpsbabel/reference/track/fugawi.txt
+++ b/gpsbabel/reference/track/fugawi.txt
@@ -8,67 +8,67 @@
 # Latitude in Degree and decimals (soutern hemisphere has neg. degrees)
 # Longitude in degree and decimals (neg. numbers: west of Greenwich)
 # Height in meters [optional when importing, always present when exporting: Date (GMT) as ISO YYYYMMDD, Time of the day relative to the date as HHMMSS
-RPT001,RPT001,,30.0621833,-91.6103500,1.0    ,20020525,170621
-RPT002,RPT002,,30.0627833,-91.6105667,0.0    ,20020525,170955
-RPT003,RPT003,,30.0627000,-91.6082667,0.0    ,20020525,171200
-RPT004,RPT004,,30.0623333,-91.6073833,0.0    ,20020525,171248
-RPT005,RPT005,,30.0615333,-91.6052833,0.0    ,20020525,171441
-RPT006,RPT006,,30.0597833,-91.5994000,0.0    ,20020525,171716
-RPT007,RPT007,,30.0578000,-91.5966833,0.0    ,20020525,171746
-RPT008,RPT008,,30.0553833,-91.5949000,0.0    ,20020525,171820
-RPT009,RPT009,,30.0538833,-91.5926167,0.0    ,20020525,171901
-RPT010,RPT010,,30.0497333,-91.5897500,0.0    ,20020525,172046
-RPT011,RPT011,,30.0490167,-91.5898833,0.0    ,20020525,172110
-RPT012,RPT012,,30.0488000,-91.5929333,0.0    ,20020525,172151
-RPT013,RPT013,,30.0462333,-91.5964500,0.0    ,20020525,172235
-RPT014,RPT014,,30.0455167,-91.5987167,0.0    ,20020525,172308
-RPT015,RPT015,,30.0473000,-91.6002667,0.0    ,20020525,180423
-RPT016,RPT016,,30.0470000,-91.5996333,2.0    ,20020525,180604
-RPT017,RPT017,,30.0464333,-91.5994667,0.0    ,20020525,180706
-RPT018,RPT018,,30.0462000,-91.5989500,1.0    ,20020525,180818
-RPT019,RPT019,,30.0463667,-91.5977333,0.0    ,20020525,181020
-RPT020,RPT020,,30.0463500,-91.5971667,0.0    ,20020525,181109
-RPT021,RPT021,,30.0467833,-91.5963333,0.0    ,20020525,181218
-RPT022,RPT022,,30.0474500,-91.5952000,0.0    ,20020525,181422
-RPT023,RPT023,,30.0478000,-91.5947667,2.0    ,20020525,181504
-RPT024,RPT024,,30.0482500,-91.5940833,1.0    ,20020525,181614
-RPT025,RPT025,,30.0486833,-91.5938000,1.0    ,20020525,181701
-RPT026,RPT026,,30.0493500,-91.5938500,0.0    ,20020525,181807
-RPT027,RPT027,,30.0503167,-91.5939833,2.0    ,20020525,181951
-RPT028,RPT028,,30.0507833,-91.5941167,0.0    ,20020525,182039
-RPT029,RPT029,,30.0512333,-91.5943667,0.0    ,20020525,182124
-RPT030,RPT030,,30.0518000,-91.5943667,0.0    ,20020525,182217
-RPT031,RPT031,,30.0522167,-91.5946667,0.0    ,20020525,182318
-RPT032,RPT032,,30.0530167,-91.5946833,0.0    ,20020525,182437
-RPT033,RPT033,,30.0548667,-91.5952000,6.0    ,20020525,182813
-RPT034,RPT034,,30.0537333,-91.5949333,2.0    ,20020525,183136
-RPT035,RPT035,,30.0531833,-91.5947833,0.0    ,20020525,183256
-RPT036,RPT036,,30.0526333,-91.5948333,0.0    ,20020525,183402
-RPT037,RPT037,,30.0524500,-91.5954333,0.0    ,20020525,183603
-RPT038,RPT038,,30.0524833,-91.5959667,0.0    ,20020525,183648
-RPT039,RPT039,,30.0526500,-91.5967833,1.0    ,20020525,183752
-RPT040,RPT040,,30.0531333,-91.5978500,0.0    ,20020525,183918
-RPT041,RPT041,,30.0536167,-91.5979667,0.0    ,20020525,184015
-RPT042,RPT042,,30.0539667,-91.5977667,6.0    ,20020525,184125
-RPT043,RPT043,,30.0536167,-91.5980833,0.0    ,20020525,184237
-RPT044,RPT044,,30.0532000,-91.5979167,0.0    ,20020525,184401
-RPT045,RPT045,,30.0528167,-91.5975167,0.0    ,20020525,184553
-RPT046,RPT046,,30.0525667,-91.5969333,0.0    ,20020525,184654
-RPT047,RPT047,,30.0523333,-91.5964333,0.0    ,20020525,184742
-RPT048,RPT048,,30.0522500,-91.5956833,0.0    ,20020525,184841
-RPT049,RPT049,,30.0522167,-91.5950167,0.0    ,20020525,184952
-RPT050,RPT050,,30.0518833,-91.5947000,0.0    ,20020525,185049
-RPT051,RPT051,,30.0510500,-91.5944000,0.0    ,20020525,185214
-RPT052,RPT052,,30.0505667,-91.5942333,0.0    ,20020525,185256
-RPT053,RPT053,,30.0501833,-91.5941000,0.0    ,20020525,185338
-RPT054,RPT054,,30.0491000,-91.5937167,0.0    ,20020525,185511
-RPT055,RPT055,,30.0484500,-91.5942500,0.0    ,20020525,185632
-RPT056,RPT056,,30.0480833,-91.5947500,0.0    ,20020525,185724
-RPT057,RPT057,,30.0475000,-91.5954500,7.0    ,20020525,185840
-RPT058,RPT058,,30.0470667,-91.5960000,0.0    ,20020525,185928
-RPT059,RPT059,,30.0466333,-91.5966000,0.0    ,20020525,190022
-RPT060,RPT060,,30.0464000,-91.5976500,0.0    ,20020525,190141
-RPT061,RPT061,,30.0462333,-91.5984667,0.0    ,20020525,190248
-RPT062,RPT062,,30.0463167,-91.5989667,0.0    ,20020525,190343
-RPT063,RPT063,,30.0467833,-91.5992833,0.0    ,20020525,190449
-RPT064,RPT064,,30.0471333,-91.5996667,0.0    ,20020525,190557
+,,,30.0621833,-91.6103500,1.0    ,20020525,170621
+,,,30.0627833,-91.6105667,0.0    ,20020525,170955
+,,,30.0627000,-91.6082667,0.0    ,20020525,171200
+,,,30.0623333,-91.6073833,0.0    ,20020525,171248
+,,,30.0615333,-91.6052833,0.0    ,20020525,171441
+,,,30.0597833,-91.5994000,0.0    ,20020525,171716
+,,,30.0578000,-91.5966833,0.0    ,20020525,171746
+,,,30.0553833,-91.5949000,0.0    ,20020525,171820
+,,,30.0538833,-91.5926167,0.0    ,20020525,171901
+,,,30.0497333,-91.5897500,0.0    ,20020525,172046
+,,,30.0490167,-91.5898833,0.0    ,20020525,172110
+,,,30.0488000,-91.5929333,0.0    ,20020525,172151
+,,,30.0462333,-91.5964500,0.0    ,20020525,172235
+,,,30.0455167,-91.5987167,0.0    ,20020525,172308
+,,,30.0473000,-91.6002667,0.0    ,20020525,180423
+,,,30.0470000,-91.5996333,2.0    ,20020525,180604
+,,,30.0464333,-91.5994667,0.0    ,20020525,180706
+,,,30.0462000,-91.5989500,1.0    ,20020525,180818
+,,,30.0463667,-91.5977333,0.0    ,20020525,181020
+,,,30.0463500,-91.5971667,0.0    ,20020525,181109
+,,,30.0467833,-91.5963333,0.0    ,20020525,181218
+,,,30.0474500,-91.5952000,0.0    ,20020525,181422
+,,,30.0478000,-91.5947667,2.0    ,20020525,181504
+,,,30.0482500,-91.5940833,1.0    ,20020525,181614
+,,,30.0486833,-91.5938000,1.0    ,20020525,181701
+,,,30.0493500,-91.5938500,0.0    ,20020525,181807
+,,,30.0503167,-91.5939833,2.0    ,20020525,181951
+,,,30.0507833,-91.5941167,0.0    ,20020525,182039
+,,,30.0512333,-91.5943667,0.0    ,20020525,182124
+,,,30.0518000,-91.5943667,0.0    ,20020525,182217
+,,,30.0522167,-91.5946667,0.0    ,20020525,182318
+,,,30.0530167,-91.5946833,0.0    ,20020525,182437
+,,,30.0548667,-91.5952000,6.0    ,20020525,182813
+,,,30.0537333,-91.5949333,2.0    ,20020525,183136
+,,,30.0531833,-91.5947833,0.0    ,20020525,183256
+,,,30.0526333,-91.5948333,0.0    ,20020525,183402
+,,,30.0524500,-91.5954333,0.0    ,20020525,183603
+,,,30.0524833,-91.5959667,0.0    ,20020525,183648
+,,,30.0526500,-91.5967833,1.0    ,20020525,183752
+,,,30.0531333,-91.5978500,0.0    ,20020525,183918
+,,,30.0536167,-91.5979667,0.0    ,20020525,184015
+,,,30.0539667,-91.5977667,6.0    ,20020525,184125
+,,,30.0536167,-91.5980833,0.0    ,20020525,184237
+,,,30.0532000,-91.5979167,0.0    ,20020525,184401
+,,,30.0528167,-91.5975167,0.0    ,20020525,184553
+,,,30.0525667,-91.5969333,0.0    ,20020525,184654
+,,,30.0523333,-91.5964333,0.0    ,20020525,184742
+,,,30.0522500,-91.5956833,0.0    ,20020525,184841
+,,,30.0522167,-91.5950167,0.0    ,20020525,184952
+,,,30.0518833,-91.5947000,0.0    ,20020525,185049
+,,,30.0510500,-91.5944000,0.0    ,20020525,185214
+,,,30.0505667,-91.5942333,0.0    ,20020525,185256
+,,,30.0501833,-91.5941000,0.0    ,20020525,185338
+,,,30.0491000,-91.5937167,0.0    ,20020525,185511
+,,,30.0484500,-91.5942500,0.0    ,20020525,185632
+,,,30.0480833,-91.5947500,0.0    ,20020525,185724
+,,,30.0475000,-91.5954500,7.0    ,20020525,185840
+,,,30.0470667,-91.5960000,0.0    ,20020525,185928
+,,,30.0466333,-91.5966000,0.0    ,20020525,190022
+,,,30.0464000,-91.5976500,0.0    ,20020525,190141
+,,,30.0462333,-91.5984667,0.0    ,20020525,190248
+,,,30.0463167,-91.5989667,0.0    ,20020525,190343
+,,,30.0467833,-91.5992833,0.0    ,20020525,190449
+,,,30.0471333,-91.5996667,0.0    ,20020525,190557

diff --git a/gpsbabel/route.c b/gpsbabel/route.c
index 6238225c9cfdf36fe0c01159bbb2173ecb41be6a..a6c51464d04a0111c3120c679e1eece2a7db3bf8 100644 (file)
--- a/gpsbabel/route.c
+++ b/gpsbabel/route.c
@@ -179,7 +179,7 @@ any_route_del_wpt( route_head *rte, waypoint *wpt, int *ct)
        dequeue( &wpt->Q );
        waypt_free( wpt );
        rte->rte_waypt_ct--;
-       (*ct)--;
+       if ( ct ) (*ct)--;
 }
 
 void 
@@ -188,6 +188,12 @@ route_del_wpt( route_head *rte, waypoint *wpt )
        any_route_del_wpt( rte, wpt, &rte_waypts );
 }
 
+void 
+track_del_wpt( route_head *rte, waypoint *wpt )
+{
+       any_route_del_wpt( rte, wpt, NULL );
+}
+
 void
 any_route_free(route_head *rte)
 {

diff --git a/gpsbabel/saroute.c b/gpsbabel/saroute.c
index a2f4c93e2b3628ed75fbafdbd4fc343a3953152b..168501857e56fec4fb5e510992d8b80939c06234 100644 (file)
--- a/gpsbabel/saroute.c
+++ b/gpsbabel/saroute.c
@@ -182,12 +182,7 @@ my_read(void)
         */
        if ( version < 6 || (control == 1)) {
                track_head = route_head_alloc();
-               if ( times ) {
-                       track_add_head(track_head);
-               }
-               else {                  
-                       route_add_head(track_head);
-               }
+               route_add_head(track_head);
                if ( control ) {
                    track_head->rte_name = xstrdup("control points");
                }
@@ -394,10 +389,21 @@ my_read(void)
                                if ( turns_important && stringlen ) 
                                        wpt_tmp->route_priority=1;
                                if ( !turns_only || stringlen ) {
-                                       route_add_wpt(track_head, wpt_tmp);
+                                       if ( times ) {
+                                           track_add_wpt(track_head,wpt_tmp);
+                                       }
+                                       else {
+                                           route_add_wpt(track_head, wpt_tmp);
+                                       }
                                        if ( old_track_head ) {
-                                               route_add_wpt(old_track_head,
+                                               if ( times ) {
+                                                 track_add_wpt(old_track_head,
+                                                  waypt_dupe(wpt_tmp));
+                                               }
+                                               else {
+                                                 route_add_wpt(old_track_head,
                                                   waypt_dupe(wpt_tmp));
+                                               }
                                                old_track_head = NULL;
                                        }
                                }

diff --git a/gpsbabel/stmwpp.c b/gpsbabel/stmwpp.c
index e927f7acb53671cb1fb79193dd5cf229ff10fd6b..6ce27417a326f6cc15f4f448a31b7a3825ce3a17 100644 (file)
--- a/gpsbabel/stmwpp.c
+++ b/gpsbabel/stmwpp.c
@@ -168,7 +168,7 @@ stmwpp_data_read(void)
                                                track = route_head_alloc();
                                                track_add_head(track);
                                        }
-                                       route_add_wpt(track, wpt);
+                                       track_add_wpt(track, wpt);
                                        break;
                        }
                        wpt = NULL;

diff --git a/gpsbabel/tpo.c b/gpsbabel/tpo.c
index aec3661df0fb6a5f8d277128ba8b7a5a82c2c592..b68b321abdbf3edbff3dc1b14a2003ac684cdd72 100644 (file)
--- a/gpsbabel/tpo.c
+++ b/gpsbabel/tpo.c
@@ -387,7 +387,7 @@ tpo_read(void)
                        /* there is no elevation data for the waypoints */
                        waypoint_temp->altitude = 0;
 
-                       route_add_wpt(track_temp, waypoint_temp);
+                       track_add_wpt(track_temp, waypoint_temp);
                }       
 
                /* free temporary memory */

diff --git a/gpsbabel/trackfilter.c b/gpsbabel/trackfilter.c
index 2e2cacc6e6cb64f0508a9c2ec44fce534f1061e2..32d2e01bb115e826f9169d9821eb40ebe18ad7c9 100644 (file)
--- a/gpsbabel/trackfilter.c
+++ b/gpsbabel/trackfilter.c
@@ -356,7 +356,7 @@ trackfilter_merge(void)
            {
                wpt = (waypoint *)elem;
                buff[j++] = waypt_dupe(wpt);
-               route_del_wpt(track, wpt);
+               track_del_wpt(track, wpt);
            }
            if (track != master)                /* i > 0 */
                track_del_head(track);
@@ -516,8 +516,8 @@ trackfilter_split(void)
            if (curr != NULL)
            {
                wpt = waypt_dupe(buff[j]);
-               route_del_wpt(master, buff[j]);
-               route_add_wpt(curr, wpt);
+               track_del_wpt(master, buff[j]);
+               track_add_wpt(curr, wpt);
                buff[j] = wpt;
            }
        }
@@ -612,7 +612,7 @@ trackfilter_range(void)             /* returns number of track points left after filtering
 
                if ((wpt->creation_time < start) || (wpt->creation_time > stop))
                {
-                   route_del_wpt(track, wpt);
+                   track_del_wpt(track, wpt);
                    dropped++;
                }
            }

diff --git a/gpsbabel/vitosmt.c b/gpsbabel/vitosmt.c
index e3de4500e0a19e5042967bf65e02a3bb1c059781..22c7d96597694263920086c1b8af10b5b1ada3b1 100644 (file)
--- a/gpsbabel/vitosmt.c
+++ b/gpsbabel/vitosmt.c
@@ -236,7 +236,7 @@ vitosmt_read(void)
                                route_head = route_head_alloc();
                                track_add_head(route_head);
                        }
-                       route_add_wpt(route_head, wpt_tmp);
+                       track_add_wpt(route_head, wpt_tmp);
                }
 
                xfree(timestamp);